colorswatch: Use gdk_window_new_input()

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index ea6112facf5cce28f9ddbce3f150a558d0c3751f..ec5dbec8656473706f5b2c02421d344a77c660bc 100644 (file)
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -453,32 +453,22 @@ swatch_realize (GtkWidget *widget)
   GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
   GtkAllocation allocation;
   GdkWindow *window;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
 
   gtk_widget_get_allocation (widget, &allocation);
   gtk_widget_set_realized (widget, TRUE);
 
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = allocation.x;
-  attributes.y = allocation.y;
-  attributes.width = allocation.width;
-  attributes.height = allocation.height;
-  attributes.wclass = GDK_INPUT_ONLY;
-  attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= GDK_BUTTON_PRESS_MASK
-                           | GDK_BUTTON_RELEASE_MASK
-                           | GDK_ENTER_NOTIFY_MASK
-                           | GDK_LEAVE_NOTIFY_MASK
-                           | GDK_TOUCH_MASK;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y;
-
   window = gtk_widget_get_parent_window (widget);
   gtk_widget_set_window (widget, window);
   g_object_ref (window);
 
-  swatch->priv->event_window = gdk_window_new (window, &attributes, attributes_mask);
+  swatch->priv->event_window = gdk_window_new_input (window,
+                                                     gtk_widget_get_events (widget)
+                                                     | GDK_BUTTON_PRESS_MASK
+                                                     | GDK_BUTTON_RELEASE_MASK
+                                                     | GDK_ENTER_NOTIFY_MASK
+                                                     | GDK_LEAVE_NOTIFY_MASK
+                                                     | GDK_TOUCH_MASK,
+                                                     &allocation);
   gtk_widget_register_window (widget, swatch->priv->event_window);
 }